Bootstrap Sass Organization #17
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Deploy preview for zothacks-site-2023-sanity ready!
|
|
Deploy preview for zothacks-site-2023 ready!
|
|
Haven't gone over your changes yet, but changing from
https://nextjs.org/docs/app/building-your-application/optimizing/fonts#google-fonts |
tyleryy
previously approved these changes
Sep 7, 2023
taesungh
reviewed
Sep 8, 2023
…com/HackAtUCI/zothacks-site-2023 into feature/bootstrap-sass-organization
taesungh
previously approved these changes
Sep 8, 2023
There was a problem hiding this comment.
Nice to have the customizations available along with a subset of styles. Two other nitpicks:
- extensions aren't required when importing/using other modules in SASS
- the
bootstrap-utilsandzothacks-thememodules could benefit from being partials, but I'm not sure how SASS is transpiled through Next, so maybe this is irrelevant- another consequence of the naming is when we want to use Bootstrap's mixins, we'll need to scope them as
bootstrap-utils.<mixin>. not saying this is any better or worse, just different from our previous usage
- another consequence of the naming is when we want to use Bootstrap's mixins, we'll need to scope them as
Note for Tyler: while linting is generally appreciated, please keep PR matter within scope: otherwise, the diff just gets cluttered. Given there's already a self-merge commit, a squash merge might be more appropriate, but I'll leave that up to Sam.
…into feature/bootstrap-sass-organization
taesungh
reviewed
Sep 10, 2023
taesungh
previously approved these changes
Sep 10, 2023
tyleryy
approved these changes
Sep 10, 2023
tyleryy
pushed a commit
that referenced
this pull request
Sep 11, 2023
* feat: create navigation bar * feat: create footer * refactor: font, dependencies, scss, footer * fix: navbar on mobile * refactor: added routes and other small changes * feat: active page link has corresponding color * feat: add ZotHacks logo * fix: use responsive css and add bold weight * chore: use absolute asset path for navbar background * fix: logo moves upon navbar expansion and navbar is fixed to top of the screen * refactor: clean up css and use bootstrap grid * fix: remove horizontal scroll * fix: switch Twitter to Hack and SVG to PNG * fix: move Hack to front of footer --------- Co-authored-by: Alexander Liu <a@alexanderliu.com> feat: text centered feat: added apply button svg to assets Bootstrap Sass Organization (#17) * feat: bootstrap sass organization * fix: installed bootstrap * fix: import font from Next instead of Google Fonts * fix: update red hex value correctly * linting * fix: custom CSS property for font * fix: sass partials * fix: new sass path, incorporated navbar and footer * fix: removed comment --------- Co-authored-by: Tyler Yu <tyleryy@uci.edu> feat: apply button
tyleryy
pushed a commit
that referenced
this pull request
Sep 18, 2023
* feat: bootstrap sass organization * fix: installed bootstrap * fix: import font from Next instead of Google Fonts * fix: update red hex value correctly * linting * fix: custom CSS property for font * fix: sass partials * fix: new sass path, incorporated navbar and footer * fix: removed comment --------- Co-authored-by: Tyler Yu <tyleryy@uci.edu> Add tiling anteater head background art (#25) - Make diagonally tiling base asset to use native CSS background repeat - Embed white background to minimize opaque file size (no transparency) - The resulting GIF uses 8 colors with dithering Co-authored-by: Taesung Hwang <Taesung@CM17.local> Set up Home page content including Landing (#21) Set up Home page content including Landing - Reorganize Landing into Home - To match common naming, rename primary page to Home - Landing is now the first view of the Home page - Wrap primary layout children in `<main>` - Use container layout for Home page sections - Add `Container` elements for sections w/ responsive vertical padding - Create yellow Apply button with bs-btn variant in Home page Landing - Use `bootstrap.button-variant` mixin for Apply button styles - Specify empty variant to React Bootstrap - Remove unnecessary sizing and layout styles - Separate usage of theme variables and Bootstrap mixins --------- Co-authored-by: Taesung Hwang <taesungh@uci.edu>
tyleryy
pushed a commit
that referenced
this pull request
Sep 18, 2023
* feat: bootstrap sass organization * fix: installed bootstrap * fix: import font from Next instead of Google Fonts * fix: update red hex value correctly * linting * fix: custom CSS property for font * fix: sass partials * fix: new sass path, incorporated navbar and footer * fix: removed comment --------- Co-authored-by: Tyler Yu <tyleryy@uci.edu> Add tiling anteater head background art (#25) - Make diagonally tiling base asset to use native CSS background repeat - Embed white background to minimize opaque file size (no transparency) - The resulting GIF uses 8 colors with dithering Co-authored-by: Taesung Hwang <Taesung@CM17.local> Set up Home page content including Landing (#21) Set up Home page content including Landing - Reorganize Landing into Home - To match common naming, rename primary page to Home - Landing is now the first view of the Home page - Wrap primary layout children in `<main>` - Use container layout for Home page sections - Add `Container` elements for sections w/ responsive vertical padding - Create yellow Apply button with bs-btn variant in Home page Landing - Use `bootstrap.button-variant` mixin for Apply button styles - Specify empty variant to React Bootstrap - Remove unnecessary sizing and layout styles - Separate usage of theme variables and Bootstrap mixins --------- Co-authored-by: Taesung Hwang <taesungh@uci.edu>
tyleryy
pushed a commit
that referenced
this pull request
Sep 19, 2023
author Albert Wang <56945244+waalbert@users.noreply.github.com> 1694217932 -0700 committer Tyler Yu <tyleryy@uci.edu> 1695095646 -0700 draft: sticker component + animations + layout * feat: create navigation bar * feat: create footer * refactor: font, dependencies, scss, footer * fix: navbar on mobile * refactor: added routes and other small changes * feat: active page link has corresponding color * feat: add ZotHacks logo * fix: use responsive css and add bold weight * chore: use absolute asset path for navbar background * fix: logo moves upon navbar expansion and navbar is fixed to top of the screen * refactor: clean up css and use bootstrap grid * fix: remove horizontal scroll * fix: switch Twitter to Hack and SVG to PNG * fix: move Hack to front of footer --------- Co-authored-by: Alexander Liu <a@alexanderliu.com> feat: draggable sticker component fix: pull from main * feat: bootstrap sass organization * fix: installed bootstrap * fix: import font from Next instead of Google Fonts * fix: update red hex value correctly * linting * fix: custom CSS property for font * fix: sass partials * fix: new sass path, incorporated navbar and footer * fix: removed comment --------- Co-authored-by: Tyler Yu <tyleryy@uci.edu> Add tiling anteater head background art (#25) - Make diagonally tiling base asset to use native CSS background repeat - Embed white background to minimize opaque file size (no transparency) - The resulting GIF uses 8 colors with dithering Co-authored-by: Taesung Hwang <Taesung@CM17.local> Set up Home page content including Landing (#21) Set up Home page content including Landing - Reorganize Landing into Home - To match common naming, rename primary page to Home - Landing is now the first view of the Home page - Wrap primary layout children in `<main>` - Use container layout for Home page sections - Add `Container` elements for sections w/ responsive vertical padding - Create yellow Apply button with bs-btn variant in Home page Landing - Use `bootstrap.button-variant` mixin for Apply button styles - Specify empty variant to React Bootstrap - Remove unnecessary sizing and layout styles - Separate usage of theme variables and Bootstrap mixins --------- Co-authored-by: Taesung Hwang <taesungh@uci.edu> feat: draggable sticker enhancements feat: sticker dragConstraints and elastic added type sticker spring transition reduced spring stiffness shadow adjustments feat: base sticker component individual sticker example rename to Base Sticker imports feat: sticker layout, file structure, animations hoisted transition object hack sticker w/ light shake animation heart sticker quickshake animation animation transition timing adjustments positioning on stickerLayout Navigation Bar and Footer (#14) * feat: create navigation bar * feat: create footer * refactor: font, dependencies, scss, footer * fix: navbar on mobile * refactor: added routes and other small changes * feat: active page link has corresponding color * feat: add ZotHacks logo * fix: use responsive css and add bold weight * chore: use absolute asset path for navbar background * fix: logo moves upon navbar expansion and navbar is fixed to top of the screen * refactor: clean up css and use bootstrap grid * fix: remove horizontal scroll * fix: switch Twitter to Hack and SVG to PNG * fix: move Hack to front of footer --------- Co-authored-by: Alexander Liu <a@alexanderliu.com> feat: sticker start + framer install feat: draggable sticker component Bootstrap Sass Organization (#17) * feat: bootstrap sass organization * fix: installed bootstrap * fix: import font from Next instead of Google Fonts * fix: update red hex value correctly * linting * fix: custom CSS property for font * fix: sass partials * fix: new sass path, incorporated navbar and footer * fix: removed comment --------- Co-authored-by: Tyler Yu <tyleryy@uci.edu> Add tiling anteater head background art (#25) - Make diagonally tiling base asset to use native CSS background repeat - Embed white background to minimize opaque file size (no transparency) - The resulting GIF uses 8 colors with dithering Co-authored-by: Taesung Hwang <Taesung@CM17.local> Set up Home page content including Landing (#21) Set up Home page content including Landing - Reorganize Landing into Home - To match common naming, rename primary page to Home - Landing is now the first view of the Home page - Wrap primary layout children in `<main>` - Use container layout for Home page sections - Add `Container` elements for sections w/ responsive vertical padding - Create yellow Apply button with bs-btn variant in Home page Landing - Use `bootstrap.button-variant` mixin for Apply button styles - Specify empty variant to React Bootstrap - Remove unnecessary sizing and layout styles - Separate usage of theme variables and Bootstrap mixins --------- Co-authored-by: Taesung Hwang <taesungh@uci.edu> feat: sticker start + framer install feat: draggable sticker component removed use state import Bootstrap Sass Organization (#17) * feat: bootstrap sass organization * fix: installed bootstrap * fix: import font from Next instead of Google Fonts * fix: update red hex value correctly * linting * fix: custom CSS property for font * fix: sass partials * fix: new sass path, incorporated navbar and footer * fix: removed comment --------- Co-authored-by: Tyler Yu <tyleryy@uci.edu> Add tiling anteater head background art (#25) - Make diagonally tiling base asset to use native CSS background repeat - Embed white background to minimize opaque file size (no transparency) - The resulting GIF uses 8 colors with dithering Co-authored-by: Taesung Hwang <Taesung@CM17.local> Set up Home page content including Landing (#21) Set up Home page content including Landing - Reorganize Landing into Home - To match common naming, rename primary page to Home - Landing is now the first view of the Home page - Wrap primary layout children in `<main>` - Use container layout for Home page sections - Add `Container` elements for sections w/ responsive vertical padding - Create yellow Apply button with bs-btn variant in Home page Landing - Use `bootstrap.button-variant` mixin for Apply button styles - Specify empty variant to React Bootstrap - Remove unnecessary sizing and layout styles - Separate usage of theme variables and Bootstrap mixins --------- Co-authored-by: Taesung Hwang <taesungh@uci.edu> feat: draggable sticker component feat: sticker dragConstraints and elastic added type sticker spring transition reduced spring stiffness shadow adjustments feat: base sticker component individual sticker example rename to Base Sticker imports Navigation Bar and Footer (#14) * feat: create navigation bar * feat: create footer * refactor: font, dependencies, scss, footer * fix: navbar on mobile * refactor: added routes and other small changes * feat: active page link has corresponding color * feat: add ZotHacks logo * fix: use responsive css and add bold weight * chore: use absolute asset path for navbar background * fix: logo moves upon navbar expansion and navbar is fixed to top of the screen * refactor: clean up css and use bootstrap grid * fix: remove horizontal scroll * fix: switch Twitter to Hack and SVG to PNG * fix: move Hack to front of footer --------- Co-authored-by: Alexander Liu <a@alexanderliu.com> feat: sticker start + framer install feat: draggable sticker component Add tiling anteater head background art (#25) - Make diagonally tiling base asset to use native CSS background repeat - Embed white background to minimize opaque file size (no transparency) - The resulting GIF uses 8 colors with dithering Co-authored-by: Taesung Hwang <Taesung@CM17.local> linting fix: removed unused import
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To customize Bootstrap, including imports and overrides, I've followed a structure similar to HackAtUCI/HackUCI-Site. This involves creating SCSS files for each of the following:
One final thing to note is that instead of importing the Fuzzy Bubbles font from
next/fontand using it inlayout.tsx, the font is now imported directly from Google Fonts in the theme variables file.